Auto merge of #1168 - alexcrichton:issue-822, r=huonw
authorbors <bors@rust-lang.org>
Wed, 14 Jan 2015 16:22:15 +0000 (16:22 +0000)
committerbors <bors@rust-lang.org>
Wed, 14 Jan 2015 16:22:15 +0000 (16:22 +0000)
commit6c22ca1a3ee2ecfb3f9f9ebe69903e6bd9cc754c
tree528e0be7b5317e91fe685cee98a66b2d0bf561d0
parenta003ace7b5396d5e60ef14ab62bed2770a7fc0b5
parentfd781a1207fca7f5b7bcdd1f0ee07b8457443ac3
Auto merge of #1168 - alexcrichton:issue-822, r=huonw

Closes #822